bitkeeper revision 1.1705.1.14 (42a9a5deJbK8YHFnSDDIGurt2uATXA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 10 Jun 2005 14:38:22 +0000 (14:38 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 10 Jun 2005 14:38:22 +0000 (14:38 +0000)
commitcaac1f78197747509f2003568a3ac283f635d29f
tree03ba6d3552c9f3fbea5b05c1179175739044795e
parent31519ad1fd9793848df4ed7597b5bb24f73e037c
parentf88b78b9b6e33ec4e8d2afdabd4bc046e97b2ee9
bitkeeper revision 1.1705.1.14 (42a9a5deJbK8YHFnSDDIGurt2uATXA)

Manual merge.
xen/arch/x86/traps.c